Skip to content

Merging master into aztec3#146

Closed
dbanks12 wants to merge 15 commits into
aztec3from
db/aztec3-merging-in-master
Closed

Merging master into aztec3#146
dbanks12 wants to merge 15 commits into
aztec3from
db/aztec3-merging-in-master

Conversation

@dbanks12

@dbanks12 dbanks12 commented Feb 15, 2023

Copy link
Copy Markdown

Description

Need Blaine's latest changes (PR #134 specifically)

Checklist:

  • I have reviewed my diff in github, line by line.
  • Every change is related to the PR description.
  • I have linked this pull request to the issue(s) that it resolves.
  • There are no unexpected formatting changes, superfluous debug logs, or commented-out code.
  • There are no circuit changes, OR specifications in /markdown/specs have been updated.
  • There are no circuit changes, OR a cryptographer has been assigned for review.
  • I've updated any terraform that needs updating (e.g. environment variables) for deployment.
  • The branch has been rebased against the head of its merge target.
  • I'm happy for the PR to be merged at the reviewer's next convenience.
  • New functions, classes, etc. have been documented according to the doxygen comment format. Classes and structs must have @brief describing the intended functionality.
  • If existing code has been modified, such documentation has been added or updated.

dbanks12 and others added 14 commits February 13, 2023 16:03
@dbanks12 @suyash67
Split Pedersen Hash & Commitment Gadgets (#95)
6e86511 
* [SQUASHED] Pedersen refactor into hash and commitment.

Rename `crypto_pedersen` to `crypto_pedersen_hash`

Rename.

Pull generator data stuff out of pedersen crypto.

Large refactor of pedersen native and stdlib.

FIX everything.

Get rid of unnecessary pedersen hash test. Its tricky to get this working: you need hash interface for byte array which is what we would like to avoid for pedersen_hash

Fix cci.

Enable ultra with different interfaces for:
1. pedersen hash
2. pedersen commitment

Use lookup pedersen for merkle tree, fixed-base pedersen for commitments.

Merkle tree test fixes.

Circuit vk updates.

* post rebase fixes.

* js eg circuit size fix.

---------

Co-authored-by: Suyash Bagad <suyashnbagad1997@gmail.com>
@suyash67
Handpicked changes necessary for aztec3.
f19bc41
@suyash67
More handpicked changes and a fix.
2468cb5
@suyash67
Fix.
615f02e
@suyash67
Port copy_as_new_witness.
8cbc1e4
@suyash67
Port must_imply.
9229a98
@suyash67
operator++.
41c6b71
@suyash67 @iAmMichaelConnor
Port changes from common.
c7652ef 
Co-authored-by: iAmMichaelConnor <mike@aztecprotocol.com>
@suyash67
Minor pedersen fix.
578820b
@suyash67 @iAmMichaelConnor
Port ecc/groups.
fe3f471 
Co-authored-by: Michael Connor <mike@aztecprotocol.com>
@suyash67 @iAmMichaelConnor
Port remaining stdlib changes.
758b217 
Co-authored-by: Michael Connor <mike@aztecprotocol.com>
@suyash67 @iAmMichaelConnor
Latest fixes.
8c88543 
Co-authored-by: Michael Connor <mike@aztecprotocol.com>
@suyash67 @iAmMichaelConnor
grumpkin conversion fix.
e98e16c 
Co-authored-by: Michael Connor <mike@aztecprotocol.com>
merged in leveldb changes including cmake bump in docker
9f65d4f
@dbanks12 dbanks12 requested a review from suyash67 February 15, 2023 14:26
@suyash67 suyash67 force-pushed the aztec3 branch 2 times, most recently from 725579b to 6f91194 Compare February 15, 2023 15:28
@dbanks12 dbanks12 closed this Feb 15, 2023
@dbanks12 dbanks12 deleted the db/aztec3-merging-in-master branch February 15, 2023 21:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@suyash67 suyash67 Awaiting requested review from suyash67

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@dbanks12 @suyash67